working on optimizing that