Code changes for ading extra features