noy changed some stuff