Many changes to beactive project