100% Just need to improve style