Replaced Deprecated Code