Still working on message, added some minimun