Changes to accomodate casts - NOT FINISHED