Finished with style_bug branch