Hopefully making this idiot proof