Feature/adhoc changes

Revision history:
v0: f0aade4d758523dbb0cddf45a1f0a120f01e7f9e