Last commit before sprint 3 merge