Suggestion on how better to handle this?