Added Amrshal return type, bool returns should be ok now