cleaned initial version 2.