started to re-work style