Added if's for features, nothing done really.