Minor updates. NOT TESTED