Worked on issues with last commit.