Some new feature 2

Please check if everything is fine!