Made changes and debugged.