Cleaned up and gap fixed