Small changes for monday :)