fix hardcode, design