Now working appropriately