Partial implementation changes