names change + bugs fix