latest changes to get it into an object instead of all together