Addnl functionality
Fixing issues