Removing confirmations and adding support for calcing status