Updated version of progdesign, still need to adapt style