Some initial modifications