put album functions restructure