Added some local modifications