added suggestions from justin