Fix for #1153, #1162 and Added Limited Functionality