Feature/alterations