'confoglol' + previous fixes applied (proper compile-able version now)