Added nice stuff