updated after jaybees sugestions