fixed up to make things pull from right place