added all my prev changes