Removed duplicated code!