Cleaned Initial version