DEP-89 [DEP-105]

Further implementation after meeting.