changing to do...end style