Removed some function to keep only few for checks