Almost no changes, work on background tomorrow