Initial implementation of suggested changes

Committer: El--Presidente