Changes for my personal taste