Fix and merge sprint 1 modification