changing functionality slightly