More work done on player