Committing for changes made during LD48 again