added new feature plus other stuff