0924 remaining

commit the remaining parts