added/modieied some function to get some new values