Commit hnyman's changes