Edited due to feedback