Additional improvements [NOT WORKING]