Completed feature/SS-05