Finished [#5] and implemented [#6]