updated to 2.4.2 and cleaner calls