removed and added some type casts