Sprint #6 implementation