Hacky but better