added better x10 support