Push final pieces of code
Final changes; fixed merge