remove reload code, change return values