Moved across to using observable