js fix plus new commented version