Updates, better sturcture