Added tc and ra checks; changed methods sigs