Improvements

Eliminates ghosting