moved to consolidate/fixed style