Made the changes. Let me know if they fit or not.