addressed review comments from gaye and lightsofapollo