Version 9

*clean-up