Added Some functionality found a bug. AH-13