fixed function calls according architecture