Fixing up for using the first time