Adding Aki's changes to commit repo