testing hacks added