small changes and new compilation