some minor changes and requirements