moved property checks to ->>