working Version 1.2