Started final changes, will finish tomorrow