Updated With Latest Bugs