renamed per review comment
corrected per review comments