Changed code and preview of new feature