CLEANUP!!!!....... what a mess....