Updated to 4.2.1 compatibility