Completed first part of #187-I