Fixed and sped up make and slot functions