Updated to reflect current needs