Some lil' changes