redesigning for better usage