Ad-hoc Commit

Commit after long time. Not sure what changes were made.