updated for 1.7.3 & composer