updated for nicer 14 code