Reformatted the Raw Interface