BASIC-923 | Updated with small bug fixes