Final changes and added nicolina testfile