Updated boring stuff :)