CST-462: Design from Baćko uploaded for reference