switched from hard coded data to user data