updated Fixed issues