Version 2.0

Added functionality