a few changes but still no luck in it working well at all