removed the inline stuff