Just some extra modifications