Expanded functionality slightly