final version of dev-sprint0