Revert "Modified to get Uniformity"

This reverts commit 60db842913718b85b5322435fc4ba7865f78cb16.
Interface Optimization
Uniformity added again