--some fn structures added