improved 1.5 support