Considerable Optimizations were made