3am changes
fixed merge conflicts: