updated, please let me know what your thoughts are/further changes you would like