Clean and different WIP

by Mark