fixing other code