Almost freezed code. Final review left