2013-08-31 sat 13:21 Cleaned up