still have leak. Improved Motion again