FEN-0007 Changed some stuff