Updated style, reverted versions etc.