261214 2230
@ cleaned up code