Properly* reworked to compile