Added a few more codes in