Changes from daspilker's review