new version based on Travis' comments started