Trying to fix setup