Version 1.4 Cleaned up