Committing some changes per Maris request