Task 9 - rebuild

Rebuild due to some launching problems