Modified for current hardware