Added Jona

Important changes were made.