changes to allow for 4.1 compatibility