Separate notwork logic in firmware