Synced with Charlie's Front End and JS