Should be final commit. Got rid of all irrelevant changes