A few changes, Some things not working