Updated to ver 1.1