Partial implementation of new features...