Added PROPER functionality