Updated to match VBE and deleted useless stuff