initial commit
incorporated Javier's advice