Replaced stuff and do it the better way