Completed

@hamo - d7 phase 5