Adding my original stuff back in