Fixing batch and reverting some stupid previous move