Few more changes, need sleep, will continue at 7AM