Some code remake