making changes
moved to better code