Cleaned invGen and merged with develop branch