Added functionality so that constant message retrieval works